bitkeeper revision 1.1389.5.49 (4280abe5EW2fJtuPr5_E283AlKrziQ)

Added back the printing of perfc arrays & histograms, under compile-time
control in xen/Rules.mk

diff --git a/xen/Rules.mk b/xen/Rules.mk
index 1fb12e8479124a23676dc62b6fcc07154f778b6f..1db12a3d0d65bf328522f898bb8a0d714d3ddcdc 100644 (file)
--- a/xen/Rules.mk
+++ b/xen/Rules.mk
@@ -2,6 +2,7 @@
 verbose     ?= n
 debug       ?= n
 perfc       ?= n
+perfc_arrays?= n
 trace       ?= n
 optimize    ?= y
 domu_debug  ?= n
@@ -54,6 +55,9 @@ endif
 
 ifeq ($(perfc),y)
 CFLAGS += -DPERF_COUNTERS
+ifeq ($(perfc_arrays),y)
+CFLAGS += -DPERF_ARRAYS
+endif
 endif
 
 ifeq ($(trace),y)

diff --git a/xen/common/perfc.c b/xen/common/perfc.c
index f98910c91c073ea74ffd130902596913bb767eaf..157d49ffc8f0805146dcada2ed98ea1d71f8a4a9 100644 (file)
--- a/xen/common/perfc.c
+++ b/xen/common/perfc.c
@@ -67,6 +67,14 @@ void perfc_printall(unsigned char key)
             for ( j = sum = 0; j < perfc_info[i].nr_elements; j++ )
                 sum += atomic_read(&counters[j]);
             printk("TOTAL[%10d]  ", sum);
+#ifdef PERF_ARRAYS
+            for ( j = 0; j < perfc_info[i].nr_elements; j++ )
+            {
+                if ( (j != 0) && ((j % 4) == 0) )
+                    printk("\n                   ");
+                printk("ARR%02d[%10d]  ", j, atomic_read(&counters[j]));
+            }
+#endif
             counters += j;
             break;
         }

diff --git a/xen/include/xen/perfc.h b/xen/include/xen/perfc.h
index 6d758497b19b97e07aefe623cac98ae6567fec91..48c7e90fb4cbcf18fdb588b1dd1fd05bc55b31cd 100644 (file)
--- a/xen/include/xen/perfc.h
+++ b/xen/include/xen/perfc.h
@@ -87,6 +87,7 @@ extern struct perfcounter perfcounters;
  * Histogram: special treatment for 0 and 1 count. After that equally spaced 
  * with last bucket taking the rest.
  */
+#ifdef PERFC_ARRAYS
 #define perfc_incr_histo(_x,_v,_n)                                          \
     do {                                                                    \
         if ( (_v) == 0 )                                                    \
@@ -99,6 +100,9 @@ extern struct perfcounter perfcounters;
         else                                                                \
             perfc_incra(_x, PERFC_MAX_ ## _n - 1);                          \
     } while ( 0 )
+#else
+#define perfc_incr_histo(_x,_v,_n) ((void)0)
+#endif
     
 #else /* PERF_COUNTERS */